From 3a6c83af660fa477cbc559bb569302b8c9e10f52 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
Date: Fri, 27 Jul 2012 21:09:59 +0200
Subject: [PATCH] Revert "extensions/gggl{,-lies}.c: do not register the same
 conversion twice or +"

This reverts commit bc66f5ae8a98896f360549cb87cbbfae77d176df

The conversions in gggl and gggl-lies are not the same, even though the lines
registering them seem identical; their effect is different since the same
names refer to different pixel formats. Further restructuring these
conversions and getting rid of the gggl legacy naming of them might be
beneficial..
---
 extensions/gggl-lies.c | 20 ++++++++++++++++++++
 extensions/gggl.c      | 23 +++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/extensions/gggl-lies.c b/extensions/gggl-lies.c
index 573c28e..40e3fe0 100644
--- a/extensions/gggl-lies.c
+++ b/extensions/gggl-lies.c
@@ -1699,6 +1699,7 @@ init (void)
   o (rgbaF, rgba8);
   o (rgba8, rgbaF);
   o (rgbaF, rgba16);
+  o (rgba16, rgbaF);
   o (rgbAF, rgbA8);
   o (rgbA8, rgbAF);
   o (rgbAF, rgbA16);
@@ -1729,10 +1730,25 @@ init (void)
   o (g16, g8);
   o (rgbaF, rgbAF);
   o (rgbAF, rgbaF);
+  o (rgbA8, rgbA16);
+  o (rgb8, rgb16);
   o (ga8, ga16);
   o (gA8, gA16);
   o (g8, g16);
+  o (rgba8, rgbaF);
+  o (rgbA8, rgbAF);
+  o (rgb8, rgbF);
+  o (ga8, gaF);
+  o (gA8, gAF);
+  o (g8, gF);
   o (rgba16, rgbaF);
+  o (rgbA16, rgbAF);
+  o (rgb16, rgbF);
+  o (ga16, gaF);
+  o (gA16, gAF);
+  o (g16, gF);
+  o (rgbaF, rgbAF);
+  o (rgbAF, rgbaF);
   o (gaF, gAF);
   o (gAF, gaF);
   o (rgbaF, rgbF);
@@ -1748,8 +1764,12 @@ init (void)
   o (rgbAF, gAF);
   o (gAF, rgbAF);
   o (rgbaF, rgb8);
+  o (rgbA8, rgbAF);
+  o (ga8, gaF);
+  o (gA8, gAF);
   o (rgbA8, rgba8);
   o (rgba8, rgbA8);
+  o (gAF, rgbAF);
   o (rgbaF, g8);
   o (rgbaF, rgb16);
   o (rgb8, rgba8);
diff --git a/extensions/gggl.c b/extensions/gggl.c
index 8e56fe3..458de8d 100644
--- a/extensions/gggl.c
+++ b/extensions/gggl.c
@@ -1816,9 +1816,25 @@ init (void)
   o (rgbAF, rgbaF);
   o (yuvF, rgbF);
   o (yuvaF, rgbaF);
+  o (rgbA8, rgbA16);
+  o (rgb8, rgb16);
   o (ga8, ga16);
   o (gA8, gA16);
   o (g8, g16);
+  o (rgba8, rgbaF);
+  o (rgbA8, rgbAF);
+  o (rgb8, rgbF);
+  o (ga8, gaF);
+  o (gA8, gAF);
+  o (g8, gF);
+  o (rgba16, rgbaF);
+  o (rgbA16, rgbAF);
+  o (rgb16, rgbF);
+  o (ga16, gaF);
+  o (gA16, gAF);
+  o (g16, gF);
+  o (rgbaF, rgbAF);
+  o (rgbAF, rgbaF);
   o (gaF, gAF);
   o (gAF, gaF);
   o (rgbaF, rgbF);
@@ -1831,8 +1847,12 @@ init (void)
   o (gaF, rgbaF);
   o (gAF, rgbAF);
   o (rgbaF, rgb8);
+  o (rgbA8, rgbAF);
+  o (ga8, gaF);
+  o (gA8, gAF);
   o (rgbA8, rgba8);
   o (rgba8, rgbA8);
+  o (gAF, rgbAF);
   o (rgbaF, rgb16);
   o (rgb8, rgba8);
   o (rgb8, rgbA8);
@@ -1840,8 +1860,11 @@ init (void)
   o (rgba8, rgb8);
   o (rgbaF, rgbA8);
   o (rgbA16, rgbaF);
+  o (yuvF, rgbF);
+  o (yuvaF, rgbaF);
   o (rgbaF, rgbaD);
   o (rgbaD, rgbaF);
+  o (rgbaF, rgb8);
 #if 0
   o (rgbF, xyzF);
   o (xyzF, rgbF);
-- 
2.30.2